Refactoring and adding more test + support for groovy mockito