Amendments following NDepend anaysis
Fixed CA warning - validate parameters
Added some missing tests