changed configuration and added unit-tests