Fixing some of my robotium tests.
Changing up tests a bit.