Fixed Encoder, adds Testing