small fixes for tests