fix distributor tests and cut over to FileStore API