Fixing unit test deps

Remove Apache::Singleton and adding Class::Singleton.