Test fixes follow-up #2