Add some JavaDoc and fix Order Test running tests un-isolated