wiring for more sampler types

Test not actually updated to use them yet.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
add support for testing 2darray