Revert "Revert "tests""

This reverts commit 7c688169392cfece915976acb793764b4640284a.
Revert "tests"

This reverts commit 64011ec3131886051f59286e4f5a0db222ccfb3a.