First pass at pointed strategy for row, cleaned up test cases