Removed non-KIF tests and unused schemes