Clean up and refactor table row.
Change table row test to use new syntax.