Corrected conversion logic and added taps to new tests