Switch to SingleInstance to make some tests