Finish work on refactoring the Amqp message property intercepter and
updated tests to mock out the needed bits.
Add tests for new clear calls.