Changed to java 7
Removed non-compiling testcases
Added apt dependency to lib