Fix: Last few test fixes