Create TestCases first, updated tag linking