Added tests + correction on ThrowIfArgumentIsEmpty