Added more tests, started moving construction into factories w/prototypes for samplers.
fakes assembly