test structure refactor