modularise tests; more shims