Finish fixing tests for new Gibbon API version.