Continued work on refactoring test infrastructure
Added table column and row header finders.