Pulling in new changes
Swap out test settings