Various test changes.