Fine tune tag test cases