Fix tests for opinionated change