BuildTest code cleanup attempt