Added Decoder and Test