Refactor tests based on UI update, main issue was bomb status messages not matching up