Implemented the ViewTestHeader in my tests
Better comments. Mats did some restructuring and changes