Unit testing - Michael and Yuriy
Fixed URL - Michael and Yuriy