Gen structures tests added and bomb added