Tests passing after view output refactor