Test refactor

Removes ginkgo and gomega