Improve enterprise features itest coverage