Separated out enum types.
Added XStream persistence to unit tests.