Re-structure test...