DATACASS-32 - Fixed testSingleton after refactoring by Matt.