ROO-3418: Fixes comments removed on class prop.

Also includes regresion tests