Unit tests re-factored to make clearer
Unit tests: more added