CLN: clean up tests
FIX: whitening