Modifications to Test classes