Reverting changes to get ready to more isolated TTD
Adding isolated views / forms tests with mocks