Added shotgun testing