Fixed NPE, re-enable UT
Safer