Working on view unit tests
merge