Adapted the unit tests to the refactored API.