Tests fixed for 2.6