Added NPE tests