Again, more robustness for zcbuildout tests