Merge branch 'jc/test-cleanup'