* Update mobile
* Add more unit tests