nested_scope test fixes for clang