Fixed merge errors. Fixed GameTest