Check in part 2: Included many tests and updated some model object names