Revert "Revert "Tests""

This reverts commit 88c8509c5a8af5aea08a5f13cba52b05b38008f0.