I think that makes sense. We could also collapse the test classes for the other ciphers to be consistent.