Fix tests for new return values.