Test class incorrectly created in main/, moving to test/
Merge remote-tracking branch 'origin/master'