Quick test fixes and debugging