Test scenarios refactoring - "after" methods removed