Added column class and updated tests.