Fixed Game Test
Merge