comments for factory class
remove not needed configuration entry for mock annotation
made nullsafe, providers do not work with null values