Updated suite for 2.5dev