minor changes, add more unittests