Changed settings to match unit tests