most tests now passing