first npb tests
Merge branches 'master' and 'npb_tests'