Fixed tests
Replaced underscores with dashes
Skipped empty factoryService and factoryClass
Applied ubot patch
Fixed style