more fixes for unit tests