tweak style and test source resolving