Enhancing flashmessenger mock