Refactored model and feature test suite in addition to adding one more attribute field for search suite