Added unit-test configuration