some fixes for tests