use with_query_fn in model spec
add assert_queries spec helper
add alternate expected values for undefined hash iteration order