Align tests to new API.