Fixed controller update routine and test