tests pass   4/3/2011 15:39 more queries