test refactoring
Fix #152