For test fix, bugs in tagging invocations