fixed unit tests to adjust for API changes