Fix cipher tests