Improve test framework
Refine doc string