Unit tests (try 2)