Remove unused builder, test factory.
Adapt excludes.