r36: Added unit tests to provide 100% coverage