Issue #117: Added tests and stubs