Tested and bugfixed inclusion tree resolution