EinsteinUTest expansion

Assorted extension of the EinsteinUTest