Started to add tests (almost green!)