more tests passing