Add --usetrash, more tests, support for --skiptrash

Change-Id: I3ca53c32e65abd521f00aa4a0957b3f294073c5b