Refactor test to use DSL generator fn's
Remove intermediate vector format for DSL
Remove final uses of vector format