Some fixes to get Bridge working with config. Config tests fail when you...

... add a local properties file.