Rearranging of tests and made a simple game