Change tests to minitest; minor cosmetic corrections