Updating for merge. Includes configuration updates as well as tweaks for the new configs
Merged, fixed conflict
Updating tests