fix dependency ordering
update tests