Fixing tests for 2.6

Not the cleanest... but they work...