Need to improve code coverage after the split controller refactor. /assign @ggriffiths /cc @xing-yang /kind cleanup