Fixed the tests broken by the move away from saving to the registry.
Switched XML format to use elements instead of attributes.