Minors adjust on Factory registering and loading.
Update testFactory file.