Continued with new java lib integration, and cleaned up tests and rubocop