Merged root tests and updates controls package.