My 2009 grant boiler heats the water fine but when the ch demands heat neither the ch pump or burner work. The demand light is on but the ch pump light is off. If you press the test switch the pump light comes on. I have checked the pump and non return valve and they are fine. If I remove the pump but keep it connected the pump light will switch on and the pump works. Could it be the flow switch?