small tests fixes
Merge pull request #15 from TeamPanicButton/tests_updated

small tests fixes