Some Changes to Main/JunitTest