Added new model closing names
Added false main to make tests