Tried to fix the testing issues
Enhanced config
More test fixes