FNAL version of PSI's psi46test/master