All tests passed, need to write my own tests