Merge branch 'ab/test-cleanup'