correct a mistake for acceleration
improve testing acceleration and refactoring