test fix and fork cleanup.
fork cleanup