added models and test dirs