Merge pull request #3 from lukeabsent/AMQNET-637

Mostly work on tests and some fixes