Fix configuration unit tests