Added more tests

Going to need to research TDD much more