Bugfixes to trade leads attr cleaning; test fixes