Cleanup
Consolidate and reorganise doc unit views tests