updates to models and tests added