Converted tests to ERT, removed trush from tools (trush exists in dash)