remove more unnecessary code
Revert "remove more unnecessary code"

This reverts commit 18a7534045b3b090b95af95b0f717f682ea243e0.
added more tests for the content