Added more test devices