Fix reporting by removing flaky test and using data-test-subj instead of counting

Fix reporting by removing flaky test and using data-test-subj instead of counting #1026