more tests passing, not all