fixed unit tests tests for #809