FIX: gateway controller route had wrong variable name.
Improved messaging / logging functionality to be more verbose
Unit test fix