Issue #21625: Added test cases to the model test based on spec