adjusting comment vs comments and added tests