More fixes
Test tweak