Actually, we should have both tests. Restoring the old ones.