Adding TC3. Updated all expected values. All test cases ok.