Make tests more modular.