Few more test fixes