Fixed bugs during test
more test fixes