Added game tests and methods
Merged in server changes