Adding derived id prop to models, updating tests accordingly.