Fixes for test scripts 1010, 1080, 1400, and 1460.