Make tests green
Add two more tests