Test build refactored.