Updated a few tests see comment for 3.05