tests now terminate correctly and don't keep running on the device
removed unused code