Upgrade ginkgo/gomega

Signed-off-by: Johannes Petzold <jpetzold@pivotallabs.com>
Un-flake tests

Signed-off-by: Johannes Petzold <jpetzold@pivotallabs.com>