Working on GameServiceTests
merge commit