Minor modifications
Add unit test for dynamic model computation