rework based on new file_with_includes type and fix directory and vhost requirement tests