add method for switching to parent window

src/main/java/com/dougnoel/sentinel/elements/tables/Table.java

@@ -36,7 +36,7 @@ public class Table extends Element {
 	protected String tableRowTag = "tr";
 	protected String tableCellDataTag = "td";
 	protected String tableDataCellLocator = "//" + tableCellDataTag;
-	protected String tableRowLocator = ".//tbody//" + tableRowTag;
+	protected String tableRowLocator = ".//tbody//" + tableCellDataTag + "/..";
 	protected String tableSiblingCellLocator = "//..//*";
 
 	/**
@@ -196,10 +196,9 @@ protected void createRowData(){
 	 * @return int the number of row elements
 	 */
 	public int getNumberOfRows() {
-		//Selenium counts a <th> tag as a <td> tag and returns it.
 		final int numberOfRows = getOrCreateRowElements().size();
 		log.trace("Number of rows found: {}", numberOfRows);
-		return numberOfRows - 1;
+		return numberOfRows;
 	}
 
 	/**

src/main/java/com/dougnoel/sentinel/pages/PageManager.java

@@ -243,9 +243,19 @@ private static void switchToNewWindow(String pageName, String index) throws Inte
 	 */
 	public static String closeChildWindow() throws InterruptedException {
 		WebDriverFactory.close();
+		return switchToParentWindow();
+	}
+
+	/**
+	 * Switches to the parent window without closing the child window.
+	 * 
+	 * @return String the handle of the parent window to which we are returning
+	 * @throws InterruptedException
+	 */
+	public static String switchToParentWindow() throws InterruptedException {
 		driver().switchTo().window(parentHandle);
-        setPage(parentPage);
-        waitForPageLoad();
+		setPage(parentPage);
+		waitForPageLoad();
 		return parentHandle;
 	}
 

src/main/java/com/dougnoel/sentinel/steps/TableVerificationSteps.java

@@ -36,7 +36,7 @@ public class TableVerificationSteps {
      * @param expectedNumberOfRows int The number of rows your are expecting.
      * @param elementName String (Table name) This should be the name of the table element to count.
      */
-    @Then("^I see (\\d+) rows in the (.*)$")
+    @Then("^I see (\\d+) rows? in the (.*)$")
     public static void verifyNumberOfTableRows(int expectedNumberOfRows, String elementName) {
         int numberOfRows = getElementAsTable(elementName).getNumberOfRows();
         var expectedResult = SentinelStringUtils.format("Expected {} rows, found {} rows.", expectedNumberOfRows, numberOfRows);