Test in activities SelectGame and PetActivity
Fixed merge