Added tags for tests