Merge branch 'as/test-cleanup'