Refactor Diabetic Model specs and make tests pass