updated most of my(devon) test cases and the corrisponding main models