Remove trash tests and fix user migration