initial query tests now pass