Change to return_code assertions