change test + java 1.7 compilation
change package names