TODO slightly cleaned up.
Unused test samples removed