Small bug fixed for Test 1&2