Fixed encryption should be working, added basic testing