Move original_post_discovery to its own module
Clean up original_post_discovery and associated tests with suggestions from Ryan