#47: Adjusted tests to new API.