Changed some tests to match new queries