Add support for resource including and test