Merge pull request #21 from LizaHCarter/enhancetest

Enhancetest
added new wine markers
updated clean-db script to upload messages.json
enhaced test coverage