testing: refactor