Added new unit test. Added properties to classes.