Revert "temporarily removed unrelated tests"

This reverts commit a37736f1acb27e7db4ab205d33b7561f6dd6e084.