adjusted comment model and the tests#189