Wrote some more tests