Updated some more tests