Add tests for views and forms. Convert tabs to spaces
Merge conflicts + Add lastest changes on tests