Merge branch 'ar/test-code-cleanup'