Updated main activity and find game tests
merge conflicts