Refactor content_pages_controller a bit and begin to test