Fixing and adding tests to keep up with controller and service changes.