Add Javanica back - tests passing again

#363 fixed