Changed for the tests