Added Service Locator pattern
Removed the license in test file