small fixes for unit tests