Fixing all of the bad merges
Merge branch 'addtests'