Feature/mobile tests

Fixes #157 #158