test refactoring

@fuqcool