fix unit tests under pyramid 1.5
fix merge conflicts