Refactoring test structure #8