dropping last few spokes deps; moving remainder spoke code to core
testdata should be part of spokes package