Convert more tests from Junit4 to Junit 3
Work on getting tests running on android, fix fixture loading
Add missing android permissions, convert basicDatastore tests to use TestUtils for fixture loading