Adjusting tests according to new segregated interfaces.