removing redundancies; adding params to tests for row cnt & agg cols