Data store tests and factory updates