Revert "Revert "Tests""

This reverts commit 80f04c3032087ce43313e8cfd154775b2fad9946.