Fix encoding for real
Additional super tests