scope include fix + tests