FIX: removed old tests and commented out files

Removed old tests and commented files