Changes in toolkit for new and old tests

Changes for newly added tests.
Changes to help fixing some already existing tests.
Merge pull request #468 from owdqa/bug/fixed_and_new

Changes in toolkit for new and old tests