fix all tests now