Fix using addtrap in tests.
Add /media tests.