Modifications for the tests to work