Finally fix all tests