bugfix unittest
merge