Test fixes for 2.2 release