Refactoring of cmdb tests.
Review fixes
Review fixes 2
And one more thing.
Merge pull request #514 from vi4m/cmdb_refactoring

Refactoring of cmdb tests.