Tidied up GameManagerImpl and test