Add trash controller, more tests.