#120 fix. test improvement