Convert some tests to goconvey, and improve assertions along the way