Patched up Sauce tests
Merge branch 'dev.sauce' into develop