Updated tests and returns nil when no message found, not an error.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mq/mq_test.go