Added an ugly hack to allow makefiles to run tests
Removed manager from views
Some name changes
Added an update phase to views