Fixing testsuite dependencies and counts.

Testsutie dependencies were not checked and counts were inaccurate
in some cases (like skipped testcase during upgrade testing).