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