Adding fix for gauge and adding tests
5 files changed