Fixed failing tests (due to recent change).