Removed extraneous methods, updated tests and added cglib for mocking