Updates to Test Class