Try fixing tests again (sorry)