refactor + simplify tests