test changes and doc for refactoring