cleanup tests, move to pure java unit tests if possible