dedup
update tests