Changes in toolkit for new and old tests

Changes for newly added tests.
Changes to help fixing some already existing tests.