Fixes to agent configuration builder and smoke tests

Modified code to work with new yaml parameters.

SMOKE tests currently passing.