Fixed a couple of configuration unit tests