Safer CreateQuery + tests