encryption up
unit tests for encryption enabled and fully covering it
cleanup