Revert "Remove more tests"

This reverts commit 7e5714a4964f8bfa4f439dcb26478f11e7aef77f.
Remove test