Merge "Add check to ensure the test-suite-tag is set"