Make cmdb tests just work with the new test runner

Another pull request is for re-factoring all the cmdb tests as well.