reworked web/device test