test refactoring cont