No need for metatesting
Merge branch 'refactor-tests' into compartmentalize