adding models and sorting out testS