1. Fine tune Tag test cases
2. Update test suite