Extended includes set. Updated test pages