unify null checks - avoid method call in favor of strict check
simplyfy test and correct some test param orders
a few more orders in test case corrected
Merge pull request #1533 from dereuromark/master-null-checks

unify null checks - avoid method call in favor of strict check