Made some changes to Main, Tester, Trainer