Work on controller tests.
Update dependencies