Fix errors in framework.
Add tests for the MVC framework...
Add the other tests back...