* fix for spec change
* enhance test case