Use XML files for all error conditions, expand test for complete Sone.