More fixes for updated Include() support. Added more tests for Include