Revise tests to match interface