Transition to JUnit4 tests and @Datastore support