Port 2.1.3 tests