Modernize the model tests

Added initialize_sql

Made small changes

Made some small changes
Merge pull request #477 from sammyshj/modernizemodeltests

Modernize the model tests