Further enhancements for include params tests