Controller singleton is still needed for old tests