Add more tags for tests