Add more unit test
Add autowired unit test to trash manager
Changes per review feedback for pull request 289
Changes per review feedback for pull request 289
Merge pull request #297 from eric-wu/develop

Rewrite the autowired test for trash manager and various changes per feedback