cleanup based on getting the right data into the test database
Merge pull request #169 from cloudedge/pull-req-master-4ed3a472668365dfb9125a765ed0332fdad712f5

https://github.com/crowbar/barclamp-network/pull/169

Merged by devtool for VictorLowther