Trying to get working first unit test
More changes with tests