Get more tests passing