Add extra components from testing in stable