Update Relocator tests to the new API