Annotate the test code a bit to make it easier to follow.

Also, during unit test, the function separator is set to ';', not ','.

Change-Id: I3ba948c54bee3c05715928f6f2f2945621fbacad