Fix certain test issues