Remove WorkRegistryBuilder, add tests