Updated default build to 2.11
Fixed macro test for 2.11