Fix Robolectric tests

FUCK YEAH
Merge branch 'robo-fix'