Revert "Revert "Tests""

This reverts commit 8b3a96d09638cf91e7a429bb10c80a006c819738.