adding more model and some few tests