Make cmdb tests just works with new test runner

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