Add device types to flue fix the tests