Added lombok
Added unit tests for class instrumentation
Refactored instrumentation code
Added name to test... (and simplified test)