Revise bomb, refactor tests
refactor tests
Add unit test