Constructors added to domain classes. Broken test fixed