Problem: Get E685 and E931 if buffer reload is interrupted. Solution: Do not abort deleting a dummy buffer. (closes #5361)
Problem: Some tests are still in old style. Solution: Change a few tests to new style. (Yegappan Lakshmanan)