one less update in the case of no devices
adding metrics
fixing tests