Add some View tests
Merge