Better formulation for testing dataset container suggested by Simone Leo.