Added a test and updated domain classes