added new test, finish models add factroies