Fix test runs on master, but they still fail