Merge "Test to make sure numRows() calls don't show unrelated errors"