Passing more tests