re-added removed tests