Modify the storage of return an array list of array list object.
Update the test unit for this changes.