Updated Model test to account for recent changes