Getting most tests passing