extract class: update tests