FIX: removed old tests and commented out files
Merge pull request #1403 from ubeda/FIX_v6r8_CodeCleanup

[v6r8] FIX: removed old tests and commented out files