Converting ChangeListMediator to Singleton
Adding TestUtil