stub solution
move a bunch of scala test files, and delete a couple of java tests