unit test fixes for latest updates