Fix flag parsing in tests
Horror Fix to Horror Bug...

And also:
targeted search and association