Moved test to 2.1-only area