rename test file
Move Query<T> to own file