Test refactorings
wip
wip
wip
wip
wip
wip
wip