Changes to Test structure.