NPE
Test updated