Some test redesign.