Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
and remove testify and spew Signed-off-by: Daniel Nephin <dnephin@gmail.com>