Update includes and includes any, update tests