Added controller tests (from code tagged 1.1.8).