Final GameTest changes