Fix TestTestDriver
Fix TestBombs failure
Merge pull request #162 from oharaandrew314/fix-tests

Fix tests