diff --git a/container/client.go b/container/client.go
index 62bce6c..9afda01 100644
--- a/container/client.go
+++ b/container/client.go
@@ -34,7 +34,7 @@ type Client interface {
 //  * DOCKER_TLS_VERIFY		whether to verify tls certificates
 //  * DOCKER_API_VERSION	the minimum docker api version to work with
 func NewClient(pullImages bool) Client {
-	cli, err := dockerclient.NewEnvClient()
+	cli, err := dockerclient.NewClientWithOpts(dockerclient.FromEnv)
 
 	if err != nil {
 		log.Fatalf("Error instantiating Docker client: %s", err)
diff --git a/container/container_test.go b/container/container_test.go
index e3a7f94..939ced5 100644
--- a/container/container_test.go
+++ b/container/container_test.go
@@ -1,25 +1,151 @@
 package container
 
 import (
-	"github.com/stretchr/testify/assert"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"testing"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
-func TestContainsWatchtowerLabel_ShouldReturnTrueIfTheWatchtowerLabelExistsOnTheContainer(t *testing.T) {
-	labelMap := map[string]string {
-		"com.centurylinklabs.watchtower": "true",
-	}
-	assert.True(t, ContainsWatchtowerLabel(labelMap))
+func TestContainer(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Container Suite")
 }
 
-func TestContainsWatchtowerLabel_ShouldReturnFalseIfTheWatchtowerLabelDoesntExistOnTheContainer(t *testing.T) {
-	labelMap := map[string]string {
-		"com.containrrr.watchtower": "lost",
-	}
-	assert.False(t, ContainsWatchtowerLabel(labelMap))
+var _ = Describe("the container", func() {
+
+	When("asked for metadata", func() {
+		var c *Container
+		BeforeEach(func() {
+			c = mockContainerWithLabels(map[string]string {
+				"com.centurylinklabs.watchtower.enable": "true",
+				"com.centurylinklabs.watchtower": "true",
+			})
+		})
+		It("should return its name on calls to .Name()", func() {
+			name := c.Name()
+			Expect(name).To(Equal("test-containrrr"))
+			Expect(name).NotTo(Equal("wrong-name"))
+		})
+		It("should return its ID on calls to .ID()", func() {
+			id := c.ID()
+
+			Expect(id).To(Equal("container_id"))
+			Expect(id).NotTo(Equal("wrong-id"))
+		})
+		It("should return true, true if enabled on calls to .Enabled()", func() {
+			enabled, exists := c.Enabled()
+
+			Expect(enabled).To(BeTrue())
+			Expect(enabled).NotTo(BeFalse())
+			Expect(exists).To(BeTrue())
+			Expect(exists).NotTo(BeFalse())
+		})
+		It("should return false, true if present but not true on calls to .Enabled()", func() {
+			c = mockContainerWithLabels(map[string]string{ "com.centurylinklabs.watchtower.enable": "false" })
+			enabled, exists := c.Enabled()
+
+			Expect(enabled).To(BeFalse())
+			Expect(enabled).NotTo(BeTrue())
+			Expect(exists).To(BeTrue())
+			Expect(exists).NotTo(BeFalse())
+		})
+		It("should return false, false if not present on calls to .Enabled()", func() {
+			c = mockContainerWithLabels(map[string]string{ "lol": "false" })
+			enabled, exists := c.Enabled()
+
+			Expect(enabled).To(BeFalse())
+			Expect(enabled).NotTo(BeTrue())
+			Expect(exists).To(BeFalse())
+			Expect(exists).NotTo(BeTrue())
+		})
+		It("should return false, false if present but not parsable .Enabled()", func() {
+			c = mockContainerWithLabels(map[string]string{ "com.centurylinklabs.watchtower.enable": "falsy" })
+			enabled, exists := c.Enabled()
+
+			Expect(enabled).To(BeFalse())
+			Expect(enabled).NotTo(BeTrue())
+			Expect(exists).To(BeFalse())
+			Expect(exists).NotTo(BeTrue())
+		})
+		When("checking if its a watchtower instance", func() {
+			It("should return true if the label is set to true", func() {
+				isWatchtower := c.IsWatchtower()
+				Expect(isWatchtower).To(BeTrue())
+			})
+			It("should return false if the label is present but set to false", func() {
+				c = mockContainerWithLabels(map[string]string{ "com.centurylinklabs.watchtower": "false" })
+				isWatchtower := c.IsWatchtower()
+				Expect(isWatchtower).To(BeFalse())
+			})
+			It("should return false if the label is not present", func() {
+				c = mockContainerWithLabels(map[string]string{ "funny.label": "false" })
+				isWatchtower := c.IsWatchtower()
+				Expect(isWatchtower).To(BeFalse())
+			})
+			It("should return false if there are no labels", func() {
+				c = mockContainerWithLabels(map[string]string{})
+				isWatchtower := c.IsWatchtower()
+				Expect(isWatchtower).To(BeFalse())
+			})
+		})
+		When("fetching the custom stop signal", func() {
+			It("should return the signal if its set", func() {
+				c = mockContainerWithLabels(map[string]string{
+					"com.centurylinklabs.watchtower.stop-signal": "SIGKILL",
+				})
+				stopSignal := c.StopSignal()
+				Expect(stopSignal).To(Equal("SIGKILL"))
+			})
+			It("should return an empty string if its not set", func() {
+				c = mockContainerWithLabels(map[string]string{})
+				stopSignal := c.StopSignal()
+				Expect(stopSignal).To(Equal(""))
+			})
+		})
+		When("fetching the image name", func() {
+			When("the zodiac label is present", func() {
+				It("should fetch the image name from it", func() {
+					c = mockContainerWithLabels(map[string]string{
+						"com.centurylinklabs.zodiac.original-image": "the-original-image",
+					})
+					imageName := c.ImageName()
+					Expect(imageName).To(Equal(imageName))
+				})
+			})
+			It("should return the image name", func() {
+				name := "image-name:3"
+				c = mockContainerWithImageName(name)
+				imageName := c.ImageName()
+				Expect(imageName).To(Equal(name))
+			})
+			It("should assume latest if no tag is supplied", func() {
+				name := "image-name"
+				c = mockContainerWithImageName(name)
+				imageName := c.ImageName()
+				Expect(imageName).To(Equal(name + ":latest"))
+			})
+		})
+	})
+})
+
+func mockContainerWithImageName(name string) *Container {
+	container := mockContainerWithLabels(nil)
+	container.containerInfo.Config.Image = name
+	return container
 }
 
-func TestContainsWatchtowerLabel_ShouldReturnFalseIfLabelsIsEmpty(t *testing.T) {
-	labelMap := map[string]string {}
-	assert.False(t, ContainsWatchtowerLabel(labelMap))
-}
+func mockContainerWithLabels(labels map[string]string) *Container {
+	content := types.ContainerJSON{
+		ContainerJSONBase: &types.ContainerJSONBase{
+			ID:    "container_id",
+			Image: "image",
+			Name:  "test-containrrr",
+		},
+		Config: &container.Config{
+			Labels: labels,
+		},
+	}
+	return NewContainer(&content, nil)
+}
\ No newline at end of file
diff --git a/container/trust_test.go b/container/trust_test.go
index 481ce64..6aa807b 100644
--- a/container/trust_test.go
+++ b/container/trust_test.go
@@ -3,10 +3,13 @@ package container
 import (
 	"os"
 	"testing"
-
 	"github.com/stretchr/testify/assert"
 )
 
+
+
+
+
 func TestEncodedEnvAuth_ShouldReturnAnErrorIfRepoEnvsAreUnset(t *testing.T) {
 	os.Unsetenv("REPO_USER")
 	os.Unsetenv("REPO_PASS")
diff --git a/container/util_test.go b/container/util_test.go
index c4d5ca7..8c4eef9 100644
--- a/container/util_test.go
+++ b/container/util_test.go
@@ -2,10 +2,11 @@ package container
 
 import (
 	"testing"
-
 	"github.com/stretchr/testify/assert"
 )
 
+
+
 func TestSliceEqual_True(t *testing.T) {
 	s1 := []string{"a", "b", "c"}
 	s2 := []string{"a", "b", "c"}