Models fixed and tests updated