deflaking sample and test configs

style cleanup