Fix test after refactor