more work on model and model tests