Deleted old test-suite code