modify test_dsa to use DSA*Numbers and split fixtures out