Get more tests to pass