fixes for enterprise tests