Fix tests for c9f77fe096