US-18: Added tests
US-18: Added tests