introducing model_schema and new tests