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...

Maybe, but {} is actually more efficient than dict() in the Python bytecode.  http://stackoverflow.com/a/6612024