Added tests with robotium; Modified instrumentation based tests