Fixes for certification tests
Merge pull request #409 from owdqa/bug/fix_suites

Fixes for certification tests