Fix: Various test updates