Complaint refactor included into the tests