Updated TestReceiver and Service