Remove unused script
Convert more tests