Add back mistakenly removed tests
2 files changed