added test for null encryptable and fixed an issue with nulls, made encryptable serializable