View tests and fixes started