Removed original Java implementation
Moved one last set of tests