changed critical parts to device tests