A bit more test refactoring, and remove DSA.

Change-Id: I70a82f8f004feba6bb946144975afec40aec3791
2 files changed