Updates to Test Structure