Start on adding tested feedback
Cleanup of patching, patch out Feedback in file tests
Cleaning up patches, strengthening file test