Moving the comment logic out of the languages file. Also adding testsv