Controller updates and testing