Step 9, added a few more tests