Fix tests in an unexpected way