Updating unit tests to match API changes