Merge branch 'ar/test-style-fixes'