May as well modernize the remaining mocks