rework, rephrase, refactor tests