add additional tests, fix null check for parameters

add additional tests, fix null check for parameters #8