Remove message test method
Refactor mobile id handling