test env fixes
Tiny test tweak
Fix apt tests