Trying again with mock [ci skip]