adjust sql1 and xpath tests to new fixtures