Test: migrate some tests from assert to expect style