Begin moving tests into place