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

I asked @asadoughi about that (dict vs {}) and his reason converted me.  Less keystrokes due to not having to use quotations.