Fixed tests for new API.