Fixes for multiple tests
Merge pull request #431 from owdqa/fix/multiple_suites

Fixes for multiple tests