Controller and test updates