Refactor advert test tracking