fixed tests & added javaparser