Handle recursive includes
Fix tests