Test build refactoring