Improved checking with a check that boiler and hotwater heater is not on in the same stage. Also added a stub bsmx test to check for proper volumes.