small fixes unit tests