CHANGE improved unit tests for gauges