Merge pull request #4 from loosebazooka/fixTests

Fix tests