added new wine markers
updated clean-db script to upload messages.json
enhaced test coverage
Merge pull request #22 from LizaHCarter/enhancetest

Enhancetest