Started on tests
Fixed originating IPs