changed options obj into a flat object so encrypt and decrypt need to be passed seperate options obj. Fixed all tests to follow this new options format.