Removed garbage, small changes to test and content for extracting paths