Porting latest code to Java 7
More Java 7 specific fixes based on IDE suggestions and cleanup
Removing unused import
More unit tests and cleanup. Executin service will be tough to finish testing without heavy mocking
Forgot to add file