Updated Models, test and fixtures to more verbose models