Content Views: Get tests to pass for rework