Half-way test case fixes after event expiry filtering introduced