related to #108 test improvement