fix some tests, split up and refactor

some wonky regression introduced by docker dependencies when running on darwin. see https://github.com/ory/dockertest/issues/212 for more info.
will have a look at this next

pkg/registry/helpers/helpers.go

@@ -0,0 +1,38 @@
+package helpers
+
+import (
+	"fmt"
+	url2 "net/url"
+)
+
+// ConvertToHostname strips a url from everything but the hostname part
+func ConvertToHostname(url string) (string, string, error) {
+	urlWithSchema := fmt.Sprintf("x://%s", url)
+	u, err := url2.Parse(urlWithSchema)
+	if err != nil {
+		return "", "", err
+	}
+	fmt.Println(url, err)
+	hostName := u.Hostname()
+	port := u.Port()
+
+
+	return hostName, port, err
+}
+
+// NormalizeRegistry makes sure variations of DockerHubs registry
+func NormalizeRegistry(registry string) (string, error) {
+	hostName, port, err := ConvertToHostname(registry)
+	if err != nil {
+		return "", err
+	}
+
+	if hostName == "registry-1.docker.io" || hostName == "docker.io" {
+		hostName = "index.docker.io"
+	}
+
+	if port != "" {
+		return fmt.Sprintf("%s:%s", hostName, port), nil
+	}
+	return hostName, nil
+}