improve handling of manuel actions (pump & selftest)