Made the Msg ID Dispenser non static (what was I thinking originally!). Fixed unit tests to comply with new API.