controller changes / unit test updates