Update tests to reflect API changes