Some test refactoring, and added a Robolectric config file