Improve the decrypt support. Add test