Fixes to some enterprise tests