updated files for except and only support, started updating tests