Passing more tests, but some failures still