Adding first unit test and working configuration
First unit test and some modifications