Updated tests to reflect merging of Models