Cleanup and testing of ZCA_Dataset (which was broken)