Add MainTest.java to modularize the test code
Merge branch 'dev-chin' into development