fix NPEx
cleanup code
new tests