fix tests, add Mobile class