Fix singleton class test for 2.1.0