Making tests more py.test-y, adding a smidge