WIP
STY: update tests following review.
REF: remove unused code.