more tests and tests passing now