Merge pull request #620 from trishagee/master

Moved around a chunk of tests