Changes from code review + extra testcase for row