fixing tests that started failing after last commit