Re-structuring tests