Fix the tests to take the default origins into account