Port 2.1.2 tests from spec