Add collector and test collector build steps to selections