Venue model tests improved