Removed old test-functionality for trashing by id. Refactored.