Most tests now passing