Fixed 2 more tests