Moving to config based settings in tests