now using java 1.7, and implemented tests