Adding unit tests for multiple fixed ips

Also includes minor cosmetic cleanup on the test modules. RM9643

I could just keep going cleaning up the unit tests, but I suppose I should stop and work on something important...

why are we mocking ipam?  easier setup?