Switched to ginkgo + gomega testing framework