Added more client controller tests.