update the test suite to test framework
add some tests to the test suite (model)
Merge remote-tracking branch 'origin/master'