added new tests, renamed files, fixed several of the javaapi functions, formatted code more nicely