merge refactor branch
small adjustment for stripe tests