API changes, test code unbroken