Fix tests errors + tags in award