More tests for r201536.