Username in created artifacts in tests fix
In progress fix for duplicate rules. FB 4930

Still needs test enhanced to test cases for non ICMP rules.