Refactor advert test based on PR feedback