Fixed tests - more suitable for different versions of deform now