Bug fix.
Test script is refined (but on going...).