Improved silence handling.
Cleaned up tests.