Fix tests
Merge pull request #31 from johnb30/reorganize

Fix tests