Updated Tests
Updated the class to meet the Singleton pattern