Fix NPE, add skip tests, copy commits from master