Sawyer has OCD
Merge branch 'cleanup/tests'