Fix: Various test fixes