Some test fixes in release