#20: Added tests