Issue #21628: Fixed broken view tests
Issue #21628: Added more view pieces