Merge "Add a suite tag to ahat unit tests"