Moved 2 files from test to java to allow compilation