test fixes, I feel it's caching issue