Moved to java7
Implemented few missing tests