Revert "temporarily removed unrelated tests"

This reverts commit e94396015073713135eb9070b63c66be1dfef209.