Refactored tests
merged
split venue into venue and venue data retriever classes