Merge "Add encryption types test"