Uncommenting removed tests