Fixes on views and test files