Fixes in the applicator, tagging and testing