Rpi utils + coverage cleanup