Test setup retooled to make it more modular