clean up tests a bit using testify lib

github.com/stretchr/testify/assert provides some nice assert shorthand
that can clean up some tests nicely.