Added a static message queue and the test