another attempt at fixing the tests