Worked on adding more tests
Fixed a couple merge conflicts