Major cleanup of ConfigTest.
Merge branch 'master' of https://github.com/glynnforrest/neptune