Test fixes follow-up