First unit tests added
Some minor changes