More gentest fun :-). NB. I'm not fixing OpenX breakage 'cos if you look