use tap
Merge branch 'refactor-tests'