Merge pull request #136 from insequent/refactor_ipam_tests

Refactor ipam tests