changed properties in configuration
added tests
added mockito for tests
refs #44