Adds some more tests