Frick's branch of Etal code under test