Attempt to fix the timer bug in the endscreen (also fixed StateTest)