Remove more robotium solo usages