Tests passing, need to create more tests