should fix the tests