Getting more tests passing