added unit test configuration + cleaning up