Added model verification tests, formatting and function calls, keys for testing, and finished merge.

Added model verification tests, formatting and function calls, keys for testing, and finished merge.