Working on client controller tests.
Client fixes after more testing.