#108 test refactoring