Modernize the model tests

Added initialize_sql

Made small changes