test architecture refactoring