Aren't those tests applicable any more? (If not, we should add new ones.)