Unittest2

better include some tests (cherry picked)