Fixing some of my robotium tests.
Changing up tests a bit.
Merge pull request #83 from dyxliang/master

Pull update.