work
java: fixing tests
java tests
rest stuff
scratch-rest
Cleanup