single_entry_test & sweeper_test
Revert "single_entry_test & sweeper_test"

This reverts commit f799d5893f27b0cdd8e1f961eb653e8a674dcffe.
Revert "Revert "single_entry_test & sweeper_test""

This reverts commit 3447e0cfc90d3fcd60a30fb58d7717f2bae0b315.