Added more scenarios. Refactored steps.
Made method names and data members more clear in Bomb
Added more scenarios