Refactored model tests to ues features