Added more testing in MainGame