Some clean up and a couple test setting tweaks.