Fixed encryption step + finished enc/dec test (it still fails... :)