DONT MERGE - Removed test which interferes with datastore