Clean up the options for model constructor
Add a test case