Make tests simpler