Fixed test failures, and corrected View to use IEnumerable