TEST refactor