Clear Up Repo and Branch Divergence

[hannahlanzrath]

Some necessary changes have diverged #87 , which needs to be cleared up. Also look into the testing repositories and where they are located.