more fixes for tests`