Fixed ambiguous methods in tests
Use AutoService for creation of Service Loader Metadata