Horizon cleanup

Includes #256 so we tests horizon on both controllers.