Updating robolectric to 2.1
Importing testutils from kouchat
Importing testutils from kouchat
Making tests run with new version of robolectric
Fixing tests that started working after upgrade of robolectric
Changing deprecated method
Removing more ignore from tests that now run
Updated changes