test: rename email fields after bug 729963 was resolved