Few test fixes