Put back accidentally removed tests
merged