Fix these tests