Most tests now passing.