Adding unit tests for multiple fixed ips

Also includes minor cosmetic cleanup on the test modules. RM9643