Merge branch 'as/test-tweaks'