Tweak to default configuration and test.