corrected indent of some extract functions
add refactoring tests to travis tests