use assert[Not]In where appropriate
86 files changed