Commit of the working version of Test 2 (Agus)