Updated unit tests to catch another XML serialization problem, maybe related to CTL-226