Added @arlin's new queries to the tests. Still failing intermittently.