Adding unit tests
More tries.
Unit tests