class redesign, row test not refactored yet