Query..add(): tests and fix, pass