Added comment fixture and functionality