improve comment and enhance test data