Add more tests
Finish part 6 of the tutorial