Update Overall_Domain_Model_v7 and updated unit tests