Added more tests
Fixed problems running tests in robolectric