Add more assert test
Stop re-instantiating DatastoreService every time
Limit test