Added tests for Enrichers, tidied up entity creation and fixed weird PortRange bug