merge issue
merge issue
Starting JMS and more unit tests