Updated the comments show
fixed tests