Make tests more customisable