Cleaned up GameTest a little