View tests
Adjustment of null constraints
Cleaned up View code