Fixing broken singleton tests.