bug 1115738 - restore column classes to fix and update tests