fixed views test failures
fixed features tests
Merge branch 'master' into mcarthur
fixed tests