fixing issues found during test, npe ..
updating tests
updating -ve tests