Refactored junit.test: moved src/test/java to src/ (part of #894)