Build controller tests - adjustments