[TASK] Re-layout tests to cover ViewHelpers properly